Script updates for the great reorg#1395
Merged
myk002 merged 2 commits intoDFHack:masterfrom Feb 9, 2025
Merged
Conversation
quietust
reviewed
Feb 9, 2025
myk002
force-pushed
the
myk_great_reorg
branch
from
7098ca3 to
c0aa99b
Compare
myk002
force-pushed
the
myk_great_reorg
branch
from
c0aa99b to
f861ec2
Compare
myk002
commented
Feb 10, 2025
Contributor
There was a problem hiding this comment.
I did not test the script, but I did try my ini generator with the new structures. There were more changes required:
--- ini/0.50.13.xml 2024-11-01 17:17:09.450090062 +0100
+++ ini/0.51.04.xml 2025-02-10 14:51:31.798059964 +0100
@@ -53,7 +53,7 @@
<global name="shapes_vector" object="world.raws.descriptors.shapes" />
<global name="reactions_vector" object="world.raws.reactions" />
<global name="base_materials" object="world.raws.mat_table.builtin" />
- <global name="all_syndromes_vector" object="world.raws.syndromes.all" />
+ <global name="all_syndromes_vector" object="world.raws.mat_table.syndromes.all" />
<global name="events_vector" object="world.history.events" />
<global name="historical_figures_vector" object="world.history.figures" />
<offset name="world_site_type" type="world_site" member="type" />
@@ -191,14 +191,14 @@
<offset name="other_armor_properties" type="itemdef_helmst" member="props" />
</section>
<section name="material_offsets">
- <offset name="solid_name" type="material_common" member="state_name[Solid]" />
- <offset name="liquid_name" type="material_common" member="state_name[Liquid]" />
- <offset name="gas_name" type="material_common" member="state_name[Gas]" />
- <offset name="powder_name" type="material_common" member="state_name[Powder]" />
- <offset name="paste_name" type="material_common" member="state_name[Paste]" />
- <offset name="pressed_name" type="material_common" member="state_name[Pressed]" />
- <offset name="flags" type="material_common" member="flags" />
- <offset name="reaction_class" type="material_common" member="reaction_class" />
+ <offset name="solid_name" type="material" member="state_name[Solid]" />
+ <offset name="liquid_name" type="material" member="state_name[Liquid]" />
+ <offset name="gas_name" type="material" member="state_name[Gas]" />
+ <offset name="powder_name" type="material" member="state_name[Powder]" />
+ <offset name="paste_name" type="material" member="state_name[Paste]" />
+ <offset name="pressed_name" type="material" member="state_name[Pressed]" />
+ <offset name="flags" type="material" member="flags" />
+ <offset name="reaction_class" type="material" member="reaction_class" />
<offset name="prefix" type="material" member="prefix" />
<offset name="inorganic_materials_vector" type="inorganic_raw" member="material" />
<offset name="inorganic_flags" type="inorganic_raw" member="flags" />
@@ -257,7 +257,7 @@
<offset name="size_base" type="unit" member="body.size_info.size_base" />
<offset name="curse" type="unit" member="curse.name" />
<offset name="curse_add_flags1" type="unit" member="curse.add_tags1" />
- <offset name="turn_count" type="unit" member="curse.time_on_site" />
+ <offset name="turn_count" type="unit" member="curse.interaction.time_on_site" />
<offset name="souls" type="unit" member="status.souls" />
<offset name="states" type="unit" member="status.misc_traits" />
<offset name="labors" type="unit" member="status.labors" />
@@ -273,7 +273,7 @@
<offset name="limb_counters" type="unit" member="status2.limbs_stand_max" />
<offset name="blood" type="unit" member="body.blood_max" />
<offset name="body_component_info" type="unit" member="body.components" />
- <offset name="layer_status_vector" type="body_component_info" member="layer_status" />
+ <offset name="layer_status_vector" type="unit.body.components" member="layer_status" />
<offset name="wounds_vector" type="unit" member="body.wounds" />
<offset name="mood_skill" type="unit" member="job.mood_skill" />
<offset name="used_items_vector" type="unit" member="used_items" />
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ref: DFHack/df-structures#824